Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Roll back batch ref updates on uncaught throwables

Change-Id: Ia82ee4d14a7b0100e9dd1a398ec2dc68bf22585c