Update TimedMediaHandler to master

Change-Id: I1566425c2b6f7cb34ec41defee60bfcc8db82734