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

Change-Id: I9c8bbe4322542d02dc43253b23ff7b0932488142