Update Multimedia extensions to master

Change-Id: I5522076d419d64d03a705c19be7bf3d8db41c708