Update TimedMediaHandler to master

Change-Id: Ia4cfeff47b2ad15da86af39e648a8f3d6c92d72d