Merge "[cleanup] Fix a clang-tidy warning" am: b57cf93f5c am: ac7150af38 am: ceacaa5cd2

Change-Id: Ie946be50353b2f1a913e1defb0c1c11b5d11af3d