Merge "Remove redundant dependencies"
am: c0a1cdc42b

Change-Id: I196fab3e127ebee6041591c37f63e07c08f11aa8