Merge "Generate serial number randomly in VTS unit test" am: 0c49ae609f
am: 63724d3555

Change-Id: I54fc99af3346af269719ac802b081fa5ad3b26da