Merge "Add ErrorResponse to policy framework exceptions"