Merge "Remove redundant dependencies" am: 62769b7196
am: 170e2e85a2

Change-Id: I05315464b2a8f4482a9999f0bba4ef35b0c38fb7