Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev