[OS-BUILD PATCH 0/4] Fix bug 1882854