Merge change 6467 into donut

* changes:
  Tighten factory data reset text. Bug 1966926.