[automerger skipped] Merge "Handle the boot profile format when analyzing profiles" am: dbd5b4325b am: b9fe624f3d -s ours

am skip reason: Change-Id I83ff959389bafcfce291485f78e1b05d6ca42625 with SHA-1 c8a0442cad is in history

Change-Id: Ibec6deac43a9c89e1c2dc0dd72082cc2830bd45e