Merge "Allow firmware loading from ODM partition"