Merge "Fix error prone build."