More d710 reconciliation... if I'm breaking stuff terribly, then lulwoops

Change-Id: Ia34acbbbf9e63868ef7f798e70d2240bb951c849