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

Change-Id: I8991cfa4a578c513a956fac0fe51028ecfab34a2