Merge "Reporting the player's data source type in media analytics" into oc-dev