Merge "Omx vts tests." into oc-dev am: 1d619f743d
am: 640d3f330a

Change-Id: Ie96f6792c8db9c22f84979d1d6f355ea15e1abdc