am 282dc2c3: Merge "Fix lookup type" into gb-ub-photos-denali

* commit '282dc2c37ad1fa27dd5e28ff148f9432f6077078':
  Fix lookup type