am f5fc8b06: am 7dbb3c29: moved the hidden sync helpers out of the framework

Merge commit 'f5fc8b06014bc763d26cc0cfcf0073a1edccfc4a'

* commit 'f5fc8b06014bc763d26cc0cfcf0073a1edccfc4a':
  moved the hidden sync helpers out of the framework