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

Change-Id: I065d9965e135f5a29d750232409a2f1fcd7c2499