am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
  Fix build.