Merge "Revert work around clang-tidy segmentation fault." am: a47e513464
am: e640a8284d

Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d