Merge \\"Recognize new clang and clang-tidy warnings.\\" am: 6131119708
am: bdcc181588

Change-Id: I38ded1b02d69b98e7d519cf7c382e7f227c32ba5