Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5
am: 180a3d07a8

Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a