Update header to match 4.2 initial bring-up