Merge "Fixes build."