Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev