Merge "Work around clang-tidy segmentation fault." am: d761dd747e am: 4a926efc49 am: 3f9923cf7f
am: 0d1879dd8c

Change-Id: I97b1f3f49cafe5e4beeb10ddb76fc47b7cc54850