Merge "Handle failure to create file." into nyc-dev
am: 808f2c361a

* commit '808f2c361af328aad8d69a02779c37f08f1fa32d':
  Handle failure to create file.

Change-Id: I12b7b03e36c4160c5a93e5a72a3395616a44809e