[protosync] Server-side -> client

Sync server-side changes from
https://critique.corp.google.com/#review/241808688 to client.

Bug: 941489
Change-Id: I9df671bd6e28a0fdf5b1f32178b40037052eb391
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1559087
Auto-Submit: Alexander Hendrich <hendrich@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#649176}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: cd351133e34a5ebb863b9888534c158b3a5a185e
1 file changed