Merge "Fix determinism for app images" into oc-dev