+ This will eventually supplant gr-diff and gr-diff-side with a simpler implementation once it reaches feature parity. Change-Id: Ib0e5279daa8e61d79f8c2099613b80ef26d639f4