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