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