Merge "buf_ans: Misc cleanup." into nextgenv2