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

* commit '95ce04cb54f38788384154630737b628c65876c6':
  Fix crash