Merge "Work around clang-tidy segmentation fault."
am: d761dd747e

Change-Id: I51913166b123b41e31c23da8c0def798057dd556