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

Change-Id: I567eda6739b2505b12775e9347013ac96f6c3ba5