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

Change-Id: Id3ff8872e18cb251719642cac1bff857166dcb5d