Merge "Set ServiceState before flags are evaluated" into mnc-dev
Amit Mahajan [Mon, 10 Aug 2015 22:02:50 +0000 (22:02 +0000)]

Trivial merge