Device build changes

Change-Id: Icfbe0b80793a38645f90d40ea1d6d3126ea4d45f