Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev
am: b73580d2fa

Change-Id: Id0c9df23459007a8063e1d508c500c5145a63170