Update from https://gerrit.omnirom.org/#/c/4249/ patchset 8