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