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