am 94759249: am f068c6e6: Merge "Low memory mode in UserHistory"

* commit '947592496f42ff13e570dc6cabb02f46d371bc02':