Merge "Do not serialize empty text in manifest proto"