Merge \\\\"Add missing dependency required for ahat-test.\\\\" am: 97c78733 am: 98f057c0 am: 67cd14fa am: 8b9d1c55 Change-Id: I07a1baf44fdbf35c92964a7ab1fc6caa7e094e82