Merge "Create bootable CSI products"
am: b4998d388e

Change-Id: Iefa52ad862f55ecaae2c56ca8cb1de4b3ef4adfd