am c39fafd8: (-s ours) am 2b2e038e: DO NOT MERGE. Stop using private styles.

* commit 'c39fafd88a209f4cfe8975351048a4a345936463':
  DO NOT MERGE. Stop using private styles.