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

Change-Id: I6f9fc52c50481b84db81410aa567cb2639279bb4