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