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

Change-Id: Ied0f25af8f6e0bed50175bc64ea8e23be04ee87d