Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev
am: 0a376f5619

Change-Id: I114f0b42e75d2aa9a288334999b7d44f0830a2d3