am 6f8d171a: am 8ea181d8: (-s ours) am f3eb0748: Merge "Fix lookupkey encoding/decoding"

* commit '6f8d171a5faa9693f7cdd41a85bbfdcdf9059281':