Merge "Clarify SystemUpdatePolicy" into pi-dev