Minor improvements to DataTypeFactory

Change-Id: I62599b9fa04184a45501f987de87b0cdede83285
Merge "Minor improvements to DataTypeFactory"