Snap for 8736029 from add50186ecbe274faa395ce13a790e94a524b408 to mainline-go-media-release

Change-Id: I33c3f116af749f320c36124fc415036bec8eebc3