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

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