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

Change-Id: I056e835343534887c7bb7afa05618bbe68bc7fbd