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

Change-Id: I0342d281cd54ec3715412096956896fbf3dc95e1