Merge "Application image support for installd DO NOT MERGE" am: 7f9c122a -s...
Merge "Application image support for installd DO NOT MERGE" am: 7f9c122a -s ours am: 3fa6da13 -s ours
am: c2ef7110 -s ours
* commit 'c2ef7110':
Application image support for installd DO NOT MERGE