Merge "Fix KM3.0 deleteKey behavior inconsistent with VTS test." into oc-dev