[automerger skipped] Merge "Fixed that DcTracker does not use correct data registration info" am: 06e2f822b9 am: b2f1c5ddb1
am: 9b42c53636 -s ours
am skip reason: change_id Ie8ae20423b794622b6a6141faf68c01b75c144ce with SHA1 1fa6cf1578 is in history

Change-Id: I85f5f0e61d51ba8624bde9854140cb17c7d7966e