am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '649efad8ca2fd4a4770fddca4537b8a3d27be47c':