am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad

* commit '891a80756166a8621f063c727000c9a943cf5465':
  Fix SRI orientation on manta