am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"

* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning