Merge "Fix system policy to mean overlays on /system"