Merge "Eliminate MCS_GIVE_UP state" into gingerbread