am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad

* commit '0e6efbccdb196ef0847e00b23165ed94a77c9f3d':
  NPE fix when we failed to open the camera