Merge "Add support for new OUT_OF_KEYS_* errors"