BugLink: http://bugs.launchpad.net/bugs/1580272

This will have to do for v4.4, backporting everything from v4.8.6 is just
not feasible.
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>