Drop b for DataValues and Diff

Change-Id: Ia312bac9d915e9fc59bd5236986384e5119c4568