[ Merge of pa/2264578 ] Test: make wvts Bug: 209663123 Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495