Merge "Remove redundant dependencies."
am: 8b4c1e4589

Change-Id: Ia79f726d5b0230836c1e5fdcf2043ab6c3ba7c18