Merge "Remove ephemeral size assertion in baremetal scenario"