[automerger skipped] Merge "Fix NR registrations states" am: 51ba72a3 am:...
[automerger skipped] Merge "Fix NR registrations states" am: 51ba72a3 am: 04e857cf -s ours am: cbaef6f1 -s ours
am skip reason: Change-Id Ia7aad1e0fc8a64d8b760dda3dc80d89bc1bd3d2f with SHA-1 69cca434 is in history
Change-Id: I0966806434a368c4a04f298e916079f62f16ef5d