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

Change-Id: Ia865e238d9247b87be7f991e95bb35d9673a7565