Device build changes

Change-Id: I3504ef0f636296939096b2d22f518801c43f8bfc