Merge "Omx vts tests." into oc-dev
am: 89ed70727d

Change-Id: I83ae4865778f42a768a556bebfc6524cbfbc0918