Merge "Remove unusued CloudMediaProvider API" into tm-dev