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

Change-Id: I17ffe8568e7752906bdf17135b54da8fc7389b49