Snap for 8347268 from e94f6887b541219b84e5029b2b2570a1979b544a to mainline-go-media-release

Change-Id: I51dbefac036994fc1afaed799892d2baa14308e5