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

Change-Id: Ic8e760342a288dc7fe0f38408dea468a9e8c31a6