am 84f95b98: (-s ours) DO NOT MERGE Avoid NPE in RequestManager shutdown

* commit '84f95b98ef8232ccce82943456a39f1ae1991f43':
  DO NOT MERGE Avoid NPE in RequestManager shutdown