am 2c102937: am d9d80a15: am 1dfc4d2c: am f7230367: am 44f22e0c: am 779f99a0: am 011ce47f: am be963611: Merge "Check contents in user history dictionary tests"

* commit '2c102937':