Merge "Get rid of separate platform_app_data_file type."