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

Change-Id: I48d0e26b2385eeefd071cc94f590400ea15d4ffa