am 5ca6ae3c: am edd0a6db: Merge "Fix some global constructors and destructors"

* commit '5ca6ae3cae1e1c821f3726dd6835c2c32b67242a':
  Fix some global constructors and destructors