Merge "Properly prepare system server profiles" into pi-dev