Merge "Fix unused function error for user build"