Merge changes Ifcde87f4,Ie0606e5d

* changes:
  Use waitForService() istead of getService()
  Get PackageManager from Context