Merge "Used checkPackage to check UID and package" into qt-dev am: db3173c72b

Change-Id: I1a8d298d6c1dd7405007ac47aa1ca9dae53c72db