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

Change-Id: I44acb8be1b5eb998091948ffffbbf33eb6375096