Device build changes

Change-Id: Iea24ceafbe1938065a6254fb1c15ef3aadf9487a