Merge "Add context for ro.boot.product.hardware.sku."