Merge "Remove redundant dependencies"
am: 5bc5653e31

Change-Id: If4e879e49ef8b8a11ac8fc5b80687e35082cf1ea