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