Comment 6 for bug 1666897

Note: this same fix will be landing in xenial, yakkety, and trusty-hwe kernels. So the template will need to be updated everywhere.

The template change can land before the kernel change lands as it won't break policy on old kernels.