Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev