Merge "Revert services assist context in KitKat" into klp-dev