Adapt to enabling CheckReturnValue in gerrit core Bug: Google b/312699566 Change-Id: Ia53c5dabb5a92dab04abf61c029d0d2e2ccb227d Signed-off-by: Edwin Kempin <ekempin@google.com>