am ad08af9b: am 22d06c58: am 4c14665c: am 9f2ba37f: am d7b76727: Merge "Make user and contacts dict use ver3 format."
* commit 'ad08af9b07c8b0a71566b77ba8ebc43557a467e1':main
commit
b429c1e738
* commit 'ad08af9b07c8b0a71566b77ba8ebc43557a467e1':main