Merge "Remove redundant dependencies" am: 206e1f132d am: 09eb765990 am: 2915b65f76
am: 402ca632b3

Change-Id: Ie958c985ee1bcc7442d2d62143fb2346d6e9ee44