ctl and cmp upgrade add-ons

Change-Id: Id7b8178ad5527f426c4dece160302f32038a9ece
2 files changed