Revert "Trimmed the branch to only the cloud_merge sub directory"

This reverts commit c466564d6b51980de02e6b2ae7fea671bbf345a0.
Rebase from 'upstream'
Trimmed the branch to only the cloud_merge sub directory