Merge "Move profiles to use bitmaps for startup methods"
am: f8637044aa

Change-Id: I5022fb4fda9955ed7acedfbf9d87f8288308da88