[automerger skipped] Merge "Using RegistrationManager was causing unintended...
[automerger skipped] Merge "Using RegistrationManager was causing unintended public APIs" am: 12df9e3d am: c940169f -s ours
am skip reason: Change-Id Iad82b7d06738468861bd49164fbb4b4dafb8c014 with SHA-1 db3e8ee0 is in history
Change-Id: I4cfb860604f8f6d524ea7ffc075c2d27ab42b232