Merge "Fix mode on /data/security."