Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev