am c7de0225: Merge "Use unambiguous mnemonics"

* commit 'c7de02259052b1eeebbfd3a0c21acf56a7e84357':
  Use unambiguous mnemonics