Merge "[media][sfplugin] fix -Wdangling-gsl" am: d3dd89caab am: 548b9b4097
am: bdbe8adc38

Change-Id: I961143d2143e26484b57c173ef883e64dcec4969