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

Change-Id: I7f6a62959e940c22770f885487be2ec7bb523db0