Snap for 8736029 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-odp-release

Change-Id: I63a47d22199ec4aa6176d5e174678402b8c6792d