Merge "Revert "Add keymaster VTS tests."" into oc-dev