Merge "Remove unused dependencies"
am: f06a3b0402

Change-Id: Ib57f1c58f690e98793683ed009e16b48434c1f93