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

* commit '1f0943dd2ce8ae2e9610cd59858fbfd7511d5df3':
  DO NOT MERGE Do not clean up global/system settings on package unintalls.