Merge "Remove redundant dependencies" am: c0a1cdc42b am: 03a732f115
am: 3f6c37a537

Change-Id: I68b0cc52156d23c8a49bdca58c60e2ede744b6c8