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

Change-Id: Id8d6943e83835e3ab180b689c210f0cf16f91689