Merge "Add extra logging when the test fails." into oc-mr1-dev am: 27547e6446
am: c7779d69ab

Change-Id: I16667b3b7346e56449cafc2ad00bed71598d318f
tree: b90b3932c6a012a9d855b10282702761fdea5777
  1. tests/