Merge "Introduce the CloudMediaProvider API"