Snap for 8620235 from 0ab7496c953676ece02843b0b3c6c66bb2ce7b00 to mainline-go-media-swcodec-release

Change-Id: I0f5a5862e20f2ad592319ed679aff72dd6fe605d