Merge "Improved user callbacks on SystemService:" into rvc-dev am: 9fa3a870 am: ae74c70a am: 26fe26d1 Change-Id: Ia7774b433e16365b41c6b0a2c2256ec891586d09