Merge "Fix build after FullRevision package change."