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

Change-Id: Id570e911d69e74c74067758ed12942a85121af84