Make ItemContentTest work with DataModel 1.0

Change-Id: I5dcd38e4e976d022c1e8e208a9201a1291c98df6
Merge "Make ItemContentTest work with DataModel 1.0"