Merge "Fix broken android.view.DisabledTest." into oc-dev