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: e43b40bb
Change-Id: I3d11728567b8c8cdf67ffd69bfb63a7f2fbf56d7