Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c am: 1190da1b1e
am: 54238c6a10

Change-Id: I2268e389fd24cece3a677d888f1745d75c35ceea