Merge "Revert work around clang-tidy segmentation fault." am: a47e513464 am: e640a8284d am: 5105505efd
am: 6deac2efb9

Change-Id: I102d49415785c308e464aa5a160dd8a5442a96ef