BugLink: https://bugs.launchpad.net/bugs/1811646

To match upstream stable v4.4 and v4.9, respectively, so that future
cherry-picking results in fewer conflicts.

No functional changes.
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>