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