Match DataType updating in DataTypes component

This change depends on https://gerrit.wikimedia.org/r/#/c/85527/

Change-Id: I0c4d0ed53ee8163ca94c6b6bccb873ffc7cae840
Merge "Match DataType updating in DataTypes component"