[automerger skipped] Merge "Used checkPackage to check UID and package" into qt-dev am: db3173c72b am: 80280b24dd -s ours

am skip reason: Change-Id I567639aa789c6c4db8e230d5db4938f92901f44e with SHA-1 4cda45544a is in history

Change-Id: Ibe17c01cbf4a2858378336dd8971ff3c2212fb28