Merge changes from topic "presubmit-am-1d523cc92d6b483ea6b09ce7e530d2fb"
* changes:
[automerge] Don't take the conductor lock for syncing vibrations. 2p: f609ed9f 2p: 02386198
[automerge] Don't take the conductor lock for syncing vibrations. 2p: f609ed9f