am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '6b9d96b2a3b32c141e2b105fcfde4f4b0dfae3f5':
  Avoid class initializers to help ProGuard.