Merge "Have Coalescer return CoalescedRow protos directly." am: 5ab679c561
am: 6e226d3bfa

Change-Id: Id16e2dc25b77a0fd006b3715d922298508b8e60d