Merge "Remove redundant dependencies"
am: 206e1f132d

Change-Id: I54c99365f0a8f5e26842e75c4ac1d20d19d0cfb1