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

Change-Id: Ibc24435c600c7e8b384707c622e13ca6376d8df5