reorder

Change-Id: Ieb489704c5fe57271903d577f909ea30702c7c3d