Reapply 131644 including the missing header changes: