Merge "Remove unnecessary dependencies."
am: aea9f83e6d

Change-Id: Ie269b3497bbe51afb74bb64527832a50029663af