Merge "Remove redundant dependencies" am: 5bc5653e31
am: 4ade37c5b0

Change-Id: I0ef97dca0ba6fb117e9b9812e27ec5891c1def1b