package reorder after sync

Change-Id: I78ee0eab65254bad3eed6817cbb62951af3fbf44