[OS-BUILD PATCH 0/2] Fix nightly rt and automotive merging