Merge "Fix secondary user test for VirtualDevice" into tm-dev