Merge "Set device credential's Window flag to be SECURE." into oc-dev