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