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

* commit 'e36870862e5e5b16bbb6afb952bd32d78e91cbff':
  Remove arm64 clang build warning