change device branch

Change-Id: I2821427673ceed7ab641f49dc4101df70fa4af67
add back trebuchet

Change-Id: Iefb008f905811918ca0cb3086fb3fe73342c7255