device_holiday: Little more cleanup

Change-Id: Ib8cb4a4a0c19cad2dde2d0fef47620ea5afdfbf5