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