Snap for 7259092 from ace68d375ce785322fc5d388a0df81b2ec3a2dd4 to mainline-media-swcodec-release

Change-Id: I69ed862c31e148110c434b5021fae4e9688036d1