Merge changes I9d3b4f8f,I4854a310

* changes:
  shell pm: move context creation to where it's used
  adb shell pm: create context as the right user