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

Change-Id: Ie1b1a3bcb2ae5f2412c75f09bdab4c50bc50e715