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 am: 93df07bb
Change-Id: I5a45e2c37d467d0f47495795fd3139d0f7cf73ed