Merge "Omx vts tests" into oc-dev am: 2e2e255125
am: cb3dc9f239

Change-Id: Ib13cbec2f5c93eddc4cb80334f5971ac5bbad951