Merge "Fix potential issue where sub info change listener is not registered."...
Merge "Fix potential issue where sub info change listener is not registered." into rvc-dev am: f0d56871 am: 16a9b71f am: ad75b1e8
Change-Id: I76b8ccb9382ce3aabeb69a28446d8399ddd8477d