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

Change-Id: I83adafe6eef5abad38647a55f854a7985843ad10