initial bring up for omni
add support for omni builds
merge in local changes
Merge remote-tracking branch 'thlg/cm-10.2' into cm-10.2