Merge "Do not notify SS change with invalid subId" into qt-qpr1-dev am: 81c33b98f2
am: 9fd89f3700

Change-Id: I6924b11ebbc8d9d59072678fb749629e8088234b