Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Make sure that `owners` are JDK8 compatible in `stable-3.4`

Change-Id: Id5c634db61c9e63796d9a6ee5db0c124afbde844