manual merge of 367910fc, don't build ota or update packages for sdk or sim

Merge commit '367910fc'