Merge "Move profiles to use bitmaps for startup methods" am: f8637044aa am: cfebe3b9c9 am: 5d38e1fc60
am: 78da703076

Change-Id: I9d29625b665ffbd15fc62d9ef5f14881e9b73730