update config and do new adaptations for bionic

Change-Id: I78c779dded038ee9dd973f52c3356eccc5c51481