am c1b6b839: am 25511b75: am 2e04f1a0: Merge "Move dataItemToEntry() off UI thread" into lmp-dev

* commit 'c1b6b83981fa6011ba6139fd45e916416e2678b7':