Merge "Add -D option to restorecon for relabeling /data/data."