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

Change-Id: I2727b65f794e02add48c2d16d2759a9903bfda3e