Merge "[automerger skipped] Merge "Do not notify SS change with invalid subId" into qt-r1-dev am: edee6e6c2a am: 71bc164289 -s ours am skip reason: change_id I906147b2d13be0bc26f8d31ec361fcd016c2cda0 with SHA1 02ce78681f is in history"