Merge "Increase OMX test timeout" into oc-dev
am: 40fe1ff784

Change-Id: I6725d3bd2cf10dd7bc97e083af5dc8550788aae8