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

Change-Id: I38c9b948a00c43c349ea3a12c61f4b307bdf4329