Merge "Fix determinism for app images" am: c4209f024a
am: a899ab3d40

Change-Id: Ia9d21d1db2be17ea041e67c364b4d166e5b4ac49