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