[automerger skipped] Merge "Handle the boot profile format when analyzing...
[automerger skipped] Merge "Handle the boot profile format when analyzing profiles" am: dbd5b432 am: b9fe624f -s ours am: dc2a06f1 -s ours
am skip reason: Change-Id I83ff959389bafcfce291485f78e1b05d6ca42625 with SHA-1 c8a0442c is in history
Change-Id: I183c42a9149af01b21ed174adb300be64b364fca