am f58a7837: am 02db7555: Merge "Fix class variable declaration." into mnc-dev

* commit 'f58a7837f1bda3ca594926eaebc42e1f2fed42b4':
  Fix class variable declaration.