Merge "Ignore mkdirs requests while storage is locked." into pi-dev am: c98ee8b964
am: a1dfff1d1e

Change-Id: I767ab298e9dc1aa739e8916f5b5acacd08abf131