Merge "Fix flaky ChangeBoundsTest and improve it." into oc-dev