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

Change-Id: I5d45df957adaf81edddfbdf2e13ddf6f8480ac5f