am 58a91d5d: am 6bc17805: Merge "Fix test after register allocator changes."

* commit '58a91d5d6dd7245e0e3ea266dc4680e345637c9d':
  Fix test after register allocator changes.