Merge "Recheck /data for selinux labeling" into cm-11.0