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