Merge "Fix the build failure with enabling DEBUG_PSS"