Merge "Correct mapping for "boot-after-ota" compilation reason"