Merge "Remove SourceIndexField FLAG_SOURCE_DATA"