Add more options for boot profile aggregation
am: 0e82e0f089

Change-Id: Ia35fb57ae55ed6c5739f2d1492ba0bf8001646ee