Merge "Fix ADT test compile error."