Part of the migration from bionic to focal as community goal. Change-Id: I100f799efb7be4a0413a38cd0e218dce43a44573