Fix some bad merging; I landed an old branch for D5502.

Auditors: btrahan