Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev