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

Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1