Merge "Remove dependency on marlin sepolicy"