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

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