Merge "citadeld: updated sepolicy"