Merge "Take out startScanWithUuidScanParam as part of refactoring"