am f1b18b44: am ee461b92: am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev

* commit 'f1b18b44e777bcae40308b8e6170ddf31f464480':
  Don't back-off ALREADY_IN_PROGRESS syncs