Merge "Allow access to media_rw_data_file for now." into nyc-dev