Merge "Revert the ANSWERING state." into gingerbread