Merge changes I46ec4bca,I64c00f3b

* changes:
  Sets dumpstate version using system properties.
  Fixed variable names according to Google C++ style.