Merge "Remove unnecessary dependencies." am: aea9f83e6d am: 173aa15ec9
am: e06b744b3d

Change-Id: I3f56aba6ea41ca4a1a3098184c64f07e1a86a081