[automerger skipped] Merge "Update registrants when transport preference...
[automerger skipped] Merge "Update registrants when transport preference changes" am: 29d0c889 am: 268b82c4
am: f8bfc82f -s ours
am skip reason: change_id Ife6fbedf3d4fd3a0cd0098a5a7a36a1566c3b981 with SHA1 d40b0ab7 is in history
Change-Id: I5b5812c7d54e5f1365ae1017d3ace9ba9a419f4b