Merge "Create stash dir recursively."
am: 7a0b65472b

Change-Id: I6f47807075044e6e71078db99988190ced32e157