change patch order

Change-Id: I3a5fd5b8d8c35395cfd52d68510769b9cf42bfa3