Merge "Rework Java coding guidelines" into stable/silicon