Deprecated and removed some getPrefixedId usage in the DataModel component

Change-Id: Id80f31c8841c332d35dbf467cff1c739e0008613
Merge "Deprecated and removed some getPrefixedId usage in the DataModel component"