new buildname handling to avoid an issue with

the disable debug feature that wont stick after reboot

Change-Id: Ieb99dfc8037db077bd550d7c764614d8bae858db