Use DataModel 0.8

Change-Id: Ibb33b54f2e8f50e9c72cfd8827b06ec69791d1f6
Merge "Use DataModel 0.8"