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: 8f871314 am: 93df07bb am: e1f79644
Change-Id: Ic0e14ef12e983554bb2a73a809a5e33b17403451