Merge "Add another property for the ODM SKU (ro.boot.product.*)"