Merge "identity/Util: Fix file write check" am: 61e8fb9442 am: 2f5ce9939d

Change-Id: I27dba94e2cf6849f4fb13bfd8ff092fe160716a8