Merge "FlattenableUtils::align memsets"