Merge change 4815

* changes:
  GoogleFeedback handles errors in core apps.