Merge "SO changes for Service Intent"