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

Change-Id: I16f85eaf2ec1c9932b6c13b27cc335a4a29e06a1