Merge \\\"Disable warning triggered in Clang r271374\\\" am: bba87840d3 am: 4643acaa34
am: 46b64ae00e

Change-Id: If4fb63fc20ba9cd10bd10c8255f2275a29477801