Change order of option

Change-Id: I868c066e40df5eb61408c1ca242a0b4ad4a8a9ec