am bce52ca5: Merge "Remove arm64 clang build warning"

* commit 'bce52ca5fae5d0062e7622d758a3619f2279c666':
  Remove arm64 clang build warning