Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev