Merge "Fix certificates creation for image sign"