Merge "Application image support for installd DO NOT MERGE" am: 7f9c122ab9  -s ours
am: 3fa6da13b3  -s ours

* commit '3fa6da13b307ce74d8778a4a1d6180043fd28b5a':
  Application image support for installd DO NOT MERGE