Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: CreateReviewNotes: Use UTF_8 constant from StandardCharsets Change-Id: I499c81f625949ced7764a84eaab24b7fd6848161