berry-pick: fix log messages
berry-pick: don't forget to sync submodules