Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev