Merge branch 'stable-3.10' into stable-3.11

* stable-3.10:
  Do not notify failures on collisions
  Fixed erroneous increment of the rescheduled metric
  Ensure failures are only incremented in RunnableWithMetrics

Change-Id: I60714422558caf9d332fce3f19b8fea66c6c2e9a