Merge "Fix determinism for app images"
am: c4209f024a

Change-Id: If856642b3575cd98a949973be760f9fb41d1a47e