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

Change-Id: Ibf2954436fea58347a54b55726ceabbbc7f6cb65