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 am: 328788e0
Change-Id: I3f9b4d610119a75d4fba81fadef80b453b4bb8fc