Merge "Changed VirtualContainer tests to use new API." into oc-dev am: c54fc53ec2
am: ed5090cd29

Change-Id: I549e6eda063dc208fe0fcb244066975ac44de9f5