Merge "Add missing dependency required for ahat-test."