Merge "Fixed that DcTracker does not use correct data registration info" am: 06e2f822b9
am: b2f1c5ddb1

Change-Id: If9d58cd463e4e6b9c7a7b32145b6712f1c7b9a4e