Reconcile sepolicy w/ cm

Change-Id: I374124e287b1b658dabc45e6549410a0b4a3ae4f