Merge "Use both IMPORTANT and AUTO_CREATE flags"