Merge "Fixing the build breakage"