Update patch set 5

Patch Set 5: Verified+1

verified bazel build and tests successfully

Patch-set: 5
Reviewer: Gerrit User 4 <4@97ee7c02-f12f-4043-b43e-dea463d88b31>
Label: Verified=+1