Bootstrap support

Change-Id: Ie7e8d766083e8376201415fd6274f004802c741a