[OS-BUILD PATCHv2 0/3] Fix nightly rt and automotive merging