Change-Id: Iad45bf241db7a38efbb4c38b00f8f955f9810be7
Some specific Catalyst Cloud stuff are here and there, they will be cleaned up later after we migrated to Distil v2. Change-Id: I81df0765cfc876faaa58a43469d87825d30c167e