Merge ming's navigation task
Merge branch 'ming6842-add_OS_for_test' into os_dev