Merge "Revert "Prevent isolated_app from searching system_data_file.""