return code. Merge from go/wvgerrit/141469 bug: 206670307 Change-Id: Iea350ffd6ba10bfd434d5012cdb4cec211ff5fda