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

* commit '6bc17805d2df2678de186e3b4c3e2f959a48555f':
  Fix test after register allocator changes.