Comment 6 for bug 1802813

This fix has already been applied to Bionic as part of bug 1808399.