Merge "Omx VTS tests" into oc-dev am: 9ec2c9e099
am: d4e4937388

Change-Id: I5cccf1544ccbafe13340cb6e7c8e00ece5a828b6