Merge "Add api tracking files for MediaProvider" into rvc-dev