rebase to pac device trees

Change-Id: Idb6f2aa3c5cc789a5210633dd6269d312c6297cb