Merge "Fix ahat dependencies."