Merge "Update networktype before sending state change." into gingerbread