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

Change-Id: I14ae729a10b9f3d1e12ea3ada1fe69589d6c90e1