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

Change-Id: I597a9699346d40b472167076f5deee4df81583a2