Merge "Attempt to fix labels on /data/system/environ/."