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

Change-Id: I1f168da658d44af26f121384f76a3d3246804560