This patch is a modified backport of the following two master commits:
* Ia017f12be0d60ea74b54396bc8278e4db92295ba
* Iae976f283df77556a71833f857a906097e6f8aeb
A clean backport isn't possible because master has some configuration for
SELinux, which doesn't make sense for Mitaka/Liberty. Also, master has
the LSM enabled by default and this change could be disruptive in a
stable release. It is now disabled by default in the backport.
Change-Id: Ia673c3634d719f16b324a0e8473ebca7ebf336fb
(cherry picked from commit 744e9b9ca7)