am f6943b71: Merge "Remove static initializers"

* commit 'f6943b71aea7ae639e41e47feaf5d2d505bee811':
  Remove static initializers