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

Change-Id: I3fc0cee8704a7933bc0a2e5a2b8897fea8e169fd