Merge "Fix Palette build.gradle"