Merge "Added backwards compatibility support for data reg" am: 60bcd226d5 am: 725bf8e553
am: 4e16241272

Change-Id: I5237678f48bf2410678f4bafc153f8d5e013a1a3