Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 688063bf33 am: 4d6bad69af
am: 104527a9d8

Change-Id: I92873b5baf0fc69f668f799e0ab359d3583f5b14