More Debianization

Change-Id: I868f8258cac465bfee7d29b5bfb9c245b7998064