package reorder after sync

Change-Id: Ia9e854060a12e8032b13c60340029ccf2b6707b2