Snap for 8736029 from c05318e10a5571297d309b986c188a6e3c5949e2 to mainline-go-media-swcodec-release

Change-Id: Icb8be1d163d558b04dec52c67de344d9e2b4bdbc