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

Change-Id: I32d0afb5c61967e87f945a652dc7f04f1e9c94a0