Merge "Add extra logging when the test fails." into oc-mr1-dev