Merge "Add an empty boot profile." am: 5fc20bb9a3
am: 0da29f40a3

Change-Id: Ia70c183ebd28a91c16398f0a3eeda8544f2abe7e