Sync style changes from external (sync3).

Change-Id: I590557ccc3bde1172e80f5a9bc0a2be2f30e23b8
11 files changed