Merge "Update KM4 VTS tests to allow s/w implementation to pass." am: 1cba34ebd4 am: 097aaee88f

Change-Id: Idd2a1a8bccfba6cf3f3d29bc1c1fddf7ad169644