Merge "Remove redundant dependencies." am: 8b4c1e4589 am: a2b80cf2ca am: 32ed1e2578  -s ours
am: bbf3fd7c52  -s ours

Change-Id: I25e7dedef1fb72a305dfd9084fe35b06bd6a657e