am 170ad354: am c7de0225: Merge "Use unambiguous mnemonics"

* commit '170ad35419620b428c15a8945416ce8cedef3e81':
  Use unambiguous mnemonics