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

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