Merge "Update VTS tests so that Mediatek pass more VTS for O. am: a945baae ...
Merge "Update VTS tests so that Mediatek pass more VTS for O. am: a945baae -s ours am: f9b71145 -s ours" into oc-mr1-dev
am: df9b1511 -s ours
Change-Id: I772497f8005c7a78f707ca0938f4c5f91d150bce