Merge "Add boot profile support" am: 3d901ec513
am: 7e73b5165d

Change-Id: I440e67c9328fa482bc08f435180a56d12d4aa38c