Cleanup default branch handling

Change-Id: If55785e0556bf47b233350171f912b6249f4926f
Add device parts

Change-Id: Id4493ca54a44ae7182d81a4d6d4bd9ce9d3b4513