Merge "Properly prepare system server profiles" into pi-dev am: cd319fc094
am: 67d2efe0f3

Change-Id: I717b51fd98c81a8ea7a247c44cf9812045a12bcc