[automerger skipped] Merge "Use Received Uri as Gateway Uri" into qt-dev am: c2615ed2 -s ours
am: d369a415 -s ours
am skip reason: change_id I3599377406b88751ee11139e9a1aa5afab734f7c with SHA1 5f78486a is in history
Change-Id: Ie79e595538ac86fa5310404b4d281e409b278db0