Merge changes from topic "may3" into rvc-dev

* changes:
  Start defining custom Error Prone.
  Get ourselves some Error Prone.