Merge "Update KM4 VTS tests to allow s/w implementation to pass."