Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev