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

Change-Id: Iee02184e9ce80b4a28ce7717609cbb1b9baabe25