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

Change-Id: Ic8eef47973790dd0e18a15d8a0c04888edaafa60