Merge "Compatibility lib changes for IP2."