Merge "Add deleteAllKeys to IKeystoreMaintenance"