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

Change-Id: Id2b155a768e5cec4486bd778fa26a7cc4fe32602