Merge "Fixed flaky RenderScript VTS Test" into oc-dev