Merge "Use Compatibility Framework to remap error codes."