Merge "Add support for preopted app images" am: 8d0b35cf85 am: ce08de32d3
am: 04c3d78e83

Change-Id: If9a728bca120a28c6ea4e1e7410b375fb381098f