Merge "Don't grant domain device:dir rw_dir_perms"