Missing dependencies in test branches. This reverts commit 146c3fac. Bug: 35800981 Change-Id: I6251b4b7132594a65f2f5faf48ed60eed96403af Test: none