Merge "Create a minimal bootable image" am: 266fa401ae am: 423895d1d0
am: 45215a513a

Change-Id: I5a222be5b5f953581083b585598dd6b947276d41