Merge "system_server remove old optimization when syncing over to system property" into main