Merge "Avoid crash on Files app when creating a directory"
am: 775c1a2cfe

Change-Id: Ib28cbb4c422ac269db85bcb8f8ff004841c8ac73