Merge "Make checker-register-hints less dexer sensitive."