am 86d9c457: Merge "Revert services assist context in KitKat" into klp-dev

* commit '86d9c457de3285f01552d4046a8a260c7a75147f':
  Revert services assist context in KitKat