Merge "b/12068020 Make kb layouts only unique to vendor/product"