Merge "Fix potential issue where sub info change listener is not registered." am: 70e62a0f79

Change-Id: I4e85581608e33a304ee53a3196f4f2207805721f