Merge "Remove unused dependencies" am: f06a3b0402 am: 8a305ea763
am: 950facb8c2

Change-Id: Ie3abdd67204b388fd3261094830aa11c163482a9