Merge "Revert work around clang-tidy segmentation fault." am: a47e5134 am: e640a828 am: 5105505e am: 6deac2ef Change-Id: I102d49415785c308e464aa5a160dd8a5442a96ef