am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

* commit '52beb04d45ff906dfaffb1799a6d93859f1d83bd':
  Fix NPE in video intent.