Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf
am: 095b6e89db

Change-Id: I168e0364798ffb7cc96034227aebd92193cb4626