Merge "Hopefully fix funky SELinux labels." into oc-dev am: a4a729ebd0
am: 87116bd078

Change-Id: Iaba40d8f89084ecfd5c2ce7e5f8b188698c87975