Merge "Remove redundant dependencies" am: 206e1f132d
am: 09eb765990

Change-Id: I608d305bff88c16f9222b5bf4a5a87c6d82bb1d8