Merge branch 'stable-3.1' * stable-3.1: Don't reset storage when rescheduling for collisions Change-Id: I395aedd271fdadf2aaeabcfb740f81cf42c0c33a