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

Change-Id: Ia8fa6ad5401811e958c36978a157df7401f5df4a