Device rebase

Change-Id: I7a06bab9bd50f8317685e50a92ef0f0be122d7bf