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

Change-Id: I76809e1d9e2fb9e39abfbc2a6f6a1e1cbf035233