Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev