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

Change-Id: I15b93df39518c96865396bcd714d6722b9e7c62f