Merge changes from topic "am-628c0ec9-d949-4f88-a8bc-febb80451ed0" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning am: d4c69259fb am: c7fc0f823a am: 60e09ff54d am: c564a8fcc4 skipped: 7ee1a034bb
  [automerger] DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning am: d4c69259fb am: c7fc0f823a am: 60e09ff54d am: c564a8fcc4
  [automerger] DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning am: d4c69259fb am: c7fc0f823a am: 60e09ff54d
  [automerger] DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning am: d4c69259fb am: c7fc0f823a
  [automerger] DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning am: d4c69259fb
  DO NOT MERGE: Don't Disable Pkg Verifier When Provisioning
tree: 9db471902da3ce03a777698c4f29fc56a139c4a0
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk