Added backwards compatibility support for data reg

Test: Manual
Bug: Bug: 73659459
Change-Id: Ib254f5bf77cbc429826a58f55babbb971db61175
2 files changed