Merge "Add ro.product.locale"