Merge "Do not notify SS change with invalid subId" am: 3878f50107
am: 77e183ba6e

Change-Id: I5ac6db21166a18f64b7cd4a9ae6d0b305c4b9523