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

Change-Id: I5202f6f2e082f1a9f59e020d847b70072620b931