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

* commit '6c8baccba8b34d877d6c9e5835feb16d8e974e34':
  Allow null self only in DecodeWeakGlobalDuringShutdown().