Merge "Fix compile-time error."