Merge \"Disable warnings triggered in Clang r271374\"
am: 73e83ec579

Change-Id: I7badac5ae194cda9411ea2856a30e4add8fc1ed8