[175543] feature cleanup for build errors.
4 files changed