Merge "Refactored the CloudMediaProvider sync API" into sc-mainline-prod