Merge "Fix and improve shift and rotate operations."
am: 541261e

* commit '541261e66273857c638677424215de91f3d65a6f':
  Fix and improve shift and rotate operations.