Merge "Temporary disable tests failing tests for O" into oc-dev
am: ed8c71e480

Change-Id: Ib0681b212b0e9e568004c6b07e66a61bb31ea371