Merge "Remove unused dependencies"
am: 1a62169e96

Change-Id: I5a6de85a7fb00ec8ecb9913dbc077046e3842bed