am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '7835ea8c351802dd6d4c7361fd24a72124a7897d':
  Fix crash