Merge "Add verbose logging for app image startup cache feature" am: 42d9967a24
am: 404a7ecaea

Change-Id: Ie5d32e4e1f3e2cf0cb5b9324ffb91b688d5235db