Partially-implements: blueprint core-vendor-decomposition Closes-bug: #1427588 Change-Id: Ic7a04eee1fe9e9a620ca6bcb843bcf2ed87cad26