[automerger skipped] Merge "Update system server profile" into pi-dev am: 7087385a56  -s ours
am: eeda920eb4  -s ours

Change-Id: I6f0dcff1603f2b7b7904d354f6f82bf80882c7e4