Merge "Remove redundant dependencies." am: 8b4c1e4589
am: a2b80cf2ca

Change-Id: I69b5f0365e0fe3fe4472f86b90457d57b817c584