Fixes redundant dependencies and .gitignore issue. am: 792c1c9a3e am: 16a91ffd88 am: 00c77fb92d
am: 9a75eb7e39

* commit '9a75eb7e391c1edcf6017e0f5dffea4334e6e97b':
  Fixes redundant dependencies and .gitignore issue.

Change-Id: Idc6d66ba3d178d7ebffdd2fdcdd7b887212be4a5