Track own MediaProvider

Change-Id: Ia484f77dc8542ef0e5dbf41f460c9c9cbdbce590
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1