* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd': b/12068020 Make kb layouts only unique to vendor/product. Do not merge