am 4c253119: Merge "Prevent unintended rotations. Bug: 4981385"

* commit '4c253119db0ce753e46ec3809b54b9e357d363db':
  Prevent unintended rotations. Bug: 4981385