Merge "API council requested tweaks to DataUnit." into pi-dev
am: b15bcea4d4

Change-Id: Ibf7dce0c3d823135834a5160bc55da94c3b874e4