am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '7ff7b04dd187b2662c9faeb58f660a248b3764a7':
  Import translations. DO NOT MERGE