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

Change-Id: I53d2f39d0792c53cdbbad59b05457218a877d0b8