Merge "Error on IRPC v3 requests for test mode keys"