Add more options for boot profile aggregation am: 0e82e0f089
am: fe51f76df2

Change-Id: Ib0c3f7afe11986094b444bbd5428d6f324d68505