Merge "Fix NPE in package manager when asserting overlays" into pi-dev
am: 61554708ba

Change-Id: Id3ed6fd761042fe16a15e5774047070c63cd5d22