Merge "Switch to clang-r383902" am: a0ba9fab45

Change-Id: I039499a777e7dc3bfb46ae23e0205862dfb8cd93