Fixes redundant dependencies and .gitignore issue. am: 792c1c9a am: 16a91ffd am: 00c77fb9 am: 9a75eb7e am: 4b7001c6 am: be02ddbe am: f30c10f6 * commit 'f30c10f6': Change-Id: I10a51f25337dab97e8dba1af78be0db21cfca3a2