Snap for 8857176 from 1091205d3beac6e94d1dc2cd6c6fcf01bd2d9337 to mainline-go-media-release

Change-Id: Id7680eacaaff86926d05c12e598d0d0d75ec4088