Merge \\\"Revert \\\"Add missing dependency required for ahat-test.\\\"\\\" am: 072350e6 am: 4610e7a9 am: 7d4b711e Change-Id: Ib29a02554b0ad1f3396043b6172c6db95da3b1b7