Merge "Map RkpProxyException error codes into get key errors"