Merge "Omx vts test." into oc-dev am: 9a9c8da39b
am: 77a91e8f08  -s ours

Change-Id: I3f0bf20f114aec39ff3a2a88e98c969a8abed327