Merge changes from topic "bump-clang-r370808" am: a50907a3fe
am: 9feafea9a6

Change-Id: Ie23e2be1d9e0be113ff18d7142f17c4be4e86b0b