Merge "identity/Util: Fix file write check"