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

Change-Id: I99e23bfbaef545717c3ad1988b9df89dc2fa80b9