Merge "Properly prepare system server profiles"
am: 15b9558018

Change-Id: I83070dd881f164e8d458925274b2fb41851b1ae5