Merge "Removing the workaround of public product sepolicy dir"