Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp