Merge branch 'stable-3.1'

* stable-3.1:
  Don't reset storage when rescheduling for collisions

Change-Id: I395aedd271fdadf2aaeabcfb740f81cf42c0c33a
tree: d132f9697d4b6bd300337087547ab9befea62f8a
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/