Snap for 8736029 from c4b2b63f749d99112a42071afe518ce1331fb7b5 to mainline-go-odp-release

Change-Id: I31e27a10d0a7449a84dfe7e27939888654522139