Merge "Make CompatConfig be package private."