Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies"