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

Change-Id: Ie6e855135de205a0579641c06485055865a0746e