[automerger skipped] Merge "Use Received Uri as Gateway Uri" into qt-dev
am:c2615ed218-s ours am skip reason: change_id I3599377406b88751ee11139e9a1aa5afab734f7c with SHA15f78486ac1is in history Change-Id: Ib1f2ed83860c90bac56fed91f1277556f3146678
This commit is contained in: