am f1d8a76d: am cbe032f8: Sync style changes from external (sync3).

* commit 'f1d8a76dec754849001f56b0697e1690edd8b770':
  Sync style changes from external (sync3).