Merge "CTS host logging fixes." into froyo