Merge "Re-organize dvr_tracking headers"