[automerger skipped] Merge "Use Received Uri as Gateway Uri" into qt-dev am: fccf61b643 -s ours
am: 379ad53004 -s ours
am skip reason: change_id Ie7b16411e6d26c88e990009733a9f5a0514d4902 with SHA1 b4f875c9b9 is in history

Change-Id: Ic724d1c1c87374e4b5289968660a4154a8d94c19