am 058a7a4f: am 8c8eb23d: Merge "Add 64bit large object support"

* commit '058a7a4f5bfda35e75cbd87af2be58e874f254c4':