Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-odp-release

Change-Id: I1880be641a49af3a56feac0e2e2cbda96cb843bd