[automerger skipped] Merge "Fixed registration info issues for legacy mode devices" am: b96ea3b7
am: 640ff61d -s ours
am skip reason: change_id I6b6f7b68585088e4cdef47f27c0093769edbe02c with SHA1 6a431778 is in history
Change-Id: Ib2a417e2966d25e483fb037b2966f17e8bcacc68