am 9f2ba37f: am d7b76727: Merge "Make user and contacts dict use ver3 format."

* commit '9f2ba37fb9f082f99b11dff435440faa8e8624bf':