Merge "Revert "Do not notify SS change with invalid subId"" into qt-r1-dev am: 464a509b4a am: 5b921e763b
am: 2a7f13c67e

Change-Id: I11b1cdc36be28d261aa070ee63132aeffb6d21dc