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

Change-Id: Ifb653ceac977ece3149dcad9c9dd510c5669961e