Ethiopia: State of emergency to end early