Match changes in DataModel

Requires: Ie153d30de497568e3 in DataModel

Change-Id: I51019cda55f6e43a5eae90b9cfaaf303004561cb