Merge "sourcedr: Extract codesearch code"