Merge "Add gitignore to ignore iml Intellij files." am: fe19ba361e
am: 1dc7e44151

Change-Id: Ia2b6238afe327c7cb18753ec616b1a744b013677