garciadav authored Jul 15, 2020 and Mark Beierl committed Aug 25, 2020

This fixes bug 1144

Change-Id: If5fc3dad9a8a5f3e2f8ca2ac55fb875d5ec12d64
Signed-off-by: David Garcia <david.garcia@canonical.com>
(cherry picked from commit 84e74693)