Merge "Fix handling mkdir failure" am: e2b32b57df

Change-Id: I30369633a9c3d5cfed6b3937d5b0d6f6b45326b0