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

Change-Id: I165484748f98d8642414473314cbad0f8a91bb35