Merge "Refactor parts of FalsingManager into FalsingCollector"