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

Change-Id: I5fbed25232ddcaceadfb8f05cfe0f401ec206611