Use of builders form media-api

Change-Id: I10f7261677b860aa70f60426bcc54ba1cab57454