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

Change-Id: I0b8b60dbc921a3ac168fc03afb9647cfd4a6e73a