Merge "Verify staged APKs pre-reboot." into qt-dev
am: e5e876265c

Change-Id: Icf1406811af1c425e9b934a4561457dcfd1e6495