Merge "Fix build breakage"