Merge "Fixed build-failure because of undeclared transtive dependency."