More reconciling with new reorg

If other devices were broken I would say revert, but other devices using the same common repos are reportedly working

Change-Id: I866168d4cdc7ecb9369d41b2cfa8155035063580