Merge "Add instruction to put the device into test harness to error message" into tm-qpr-dev