new device repo branch

Change-Id: I097b4ad3241ecaec2518e59e5d6909ea461d023b