More common tree migration

Change-Id: I5df4c2924dde724d946cc301cb709c85c45dcfc4
Signed-off-by: ayysir <dresadd09691@gmail.com>