[automerger skipped] Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e am: be27410a12 am: a924317c6d -s ours
am: a192a3f9f0 -s ours
am skip reason: change_id I2ba6a971fff4e29ccd2166c381308fcd953f5bc0 with SHA1 55b2bc4615 is in history

Change-Id: I22b9447b35ef99c29d0f582bb58d80850f5d20a7