Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Fix misleading log message when adding reviewers

Change-Id: I6660cb2fc3205b279f37a5d7ce3376e61ec79c6c