Device build changes

Change-Id: I76953b2d994a073f0905401e06bb1bd6efd8f09e