Merge "Frameworks: Fix tidy build"