am 29ce77f6: Merge "419 fails on optimizing/arm64."

* commit '29ce77f654412dbb5fb3d5949da4053952917101':
  419 fails on optimizing/arm64.