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

Change-Id: I97edeab27ca26bd9e7a5d11884e1e9f50fdb9976