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

Change-Id: I18e806fe8f9ff712ca9e236f0cee5f6e914ddde5