Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev