Update patch set 2

Patch-set: 2
Reviewer: Gerrit User 241953 <241953@97ee7c02-f12f-4043-b43e-dea463d88b31>