Merge "Fixed mimetype error of PPT file" am: 3c28e2b280
am: 148414cd2c

Change-Id: I73f527fd006a39f00dafbe0b8c85cd583cf283f7