Merge "Ensure packages in shared user are valid" into qt-dev am: 2e88677636
am: fb576dba37

Change-Id: I8ac19f419aa405a9acfa0ee3c35071a26005e60e