Next round of OCG apparmor fixes

Change-Id: Ifffa4f377b25aa30891f069c47322c3e47dceab1
Merge "Next round of OCG apparmor fixes" into production