Merge "Use Received Uri as Gateway Uri" am: 3221273d85 am: c99ca691f4
am: ce5d7f7ddc

Change-Id: Ib8c37a456a459c3daf61d141c0f7e559a24c7ef2