Merge "Pre-cache more system servers" into pi-dev
am: 0c2985384b

Change-Id: Ic6b58e5d2a1e1df1ccf683c09e6422fdd16e5c78