Merge "Fix modifiers order to comply with Java coding guidelines" into stable/boron