am c7a7b118: am a46ff664: Merge "Use register numbers instead of register names"

* commit 'c7a7b118b501e82d98209ad64ddc18ac4ba404f7':
  Use register numbers instead of register names