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

Change-Id: I13d82525b74cda13672e4d9beba8a0d6ba9b0f24