Merge "Fix the wrong IMPORTANCE_ values." into oc-dev