Merge "Revert "Introduce app_data_file_type attribute.""