am 1757d8a3: am f3eb0748: Merge "Fix lookupkey encoding/decoding"

* commit '1757d8a3026ed77f213621c4adeee718049ac712':
  Fix lookupkey encoding/decoding