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

Change-Id: Iacdb587366e13e4177d6071f90303ff227946f10