Merge "Fix build failure"