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

* commit '34c84972f83c3bb38c4308654ae2313bbd8aed17':
  Fix crash