Merge "Integration build failure fix:"