Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118 am: 2916273738
am: 040b2c0a15

Change-Id: I46441d26b2257ba71f39a009ccd9039a0b3d01d1