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

Change-Id: I36f61b9a0103b75aa168e0fa0564bc103ef5de58