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

Change-Id: I0256d40c415569c48c4c13c8e7909431b11f3608