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

Change-Id: I6ebf26ff6453e32fbe6799d04fcff23c763834ac