Working on support for other distros.

Change-Id: Ibc64700a528ff6bf3b1a4f64e640a8f51b9bf461