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

Change-Id: I8cf1043c3206c6ae38bc24cf41e7cdfeb8c19d61