Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-media-swcodec-release

Change-Id: Ia3a923f59c61d980468d1b2b84ba2605f523e75d