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 am: cd4ec692
Change-Id: If08263f051bdaac1c37e487310c6189f7b55127a