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

Change-Id: I4d8487e013504b92be526161b068cfb740a467fc