[OS-BUILD PATCHv7 0/5] Fix bug 1882854