Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE