Use DataTypes 0.4

Change-Id: Ie88bbdead1022cf1e361f7fe69138ffdc7695e0f
Merge "Use DataTypes 0.4"