Merge "Fix ADT after FullRevision package change."