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
Change-Id: Ib25cd3109b5bf1b1a5af759856b91ccb710f3e54