Merge "Remove redundant dependencies" am: 62769b7196 am: 170e2e85a2 am: 5fba1db1d2
am: f90189a79f

Change-Id: I6ccecef314c8cd591108a0c739580eda2178425e