Merge "Address API feedback on SKU/ODM_SKU"