Merge "Revert workaround of clang-tidy segmentation fault." am: 243ab9cc7e am: b547153143 am: 952005b1df
am: f13c54c5ed

Change-Id: I2f8eb4dbf7835fdea8ef5bf917170d2b19c938a8