Uploaded for eoan and disco. bionic doesn't cherry-pick cleanly - Gunnar, can you prepare a branch please?
Uploaded for eoan and disco. bionic doesn't cherry-pick cleanly - Gunnar, can you prepare a branch please?