Merge "Fix determinism for app images"