Merge "Allow firmware loading from ODM partition" am: 5b78366665
am: 4a33cee3f8

Change-Id: I6540bc6bf98adaf9d83b8e3f398081438f4cbafc