am ba6d63e0: am a4ad7348: am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test"

* commit 'ba6d63e09369b44f32bedfa70ed50fbf01b0f3ee':
  Fixing unused param warnings in sync_test