Bootstrap support

Change-Id: Id20f3b8640d6846d709571d27d92b6c51780b2a5