Merge stable-2.13 into stable-2.14

* stable-2.13:
  Fix race condition when removing changeId/accountId locks

Change-Id: I1263f313a5e93c6ea962c1470a3f20e1babae6d8