Merge "Catch NPE in getServiceStateForSubscriber" am: c6e5a7197e
am: 915b05da82

Change-Id: I17071da8dbbf7723f6bc5727cddb27d744465031