Merge "Fix handling mkdir failure" am: e2b32b57df am: 77ec5ab0bc

Change-Id: Ib6b4f3d55c8169b6b2cbb4877451fd38896eafbc