Correct merge error in previous commit ec78ad65a1110fe007c3bdaba824f66bbfe522e3: all changes sent by HTC were not included.