Show expected values in log

Log the expected values as well as the actual values when
something looks wrong.

Change-Id: Ibf53ad318af0c5de8e6b10f59d75ff55cb781f22
2 files changed