Merge "Fix error for compiler update."