Merge "MediaDataSource: address API council comments" into mnc-dev