Merge "Work around clang-tidy segmentation fault." am: d761dd747e
am: 4a926efc49

Change-Id: I5e4b9b8507dc24bb44323c331eabe1afb25dd8f5