Merge "Omx vts test." into oc-dev
am: 9a9c8da39b

Change-Id: I4ac6e9ffe3ccd4b473d7355c1c18df14f31cfc3e