Merge "Remove redundant dependencies"
am: 62769b7196

Change-Id: Ie576459d47efdb1120b92a0e7c1a052b0ac15443