am 2582e1ec: Merge "Allow null self only in DecodeWeakGlobalDuringShutdown()."

* commit '2582e1ec39adc69bf29b60dba8c9d62b218fd741':
  Allow null self only in DecodeWeakGlobalDuringShutdown().