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 am: c60c9216
Change-Id: If63ceada6e471027a828f1391a5d4f48b6abfe4f