Merge "Make checker-register-hints less dexer sensitive."
am: 1a36a3cb97

Change-Id: I6ccfe6f14fb93c67dee9129cf2caa8171b84be41