adding to canonical-devices-system-image as we would need this bug fix to land along with any shell rotation work.
adding to canonical- devices- system- image as we would need this bug fix to land along with any shell rotation work.