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

* commit '5245393ef6b18c181fac43111a1dbfa6f829af01':
  Remove arm64 clang build warning