Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb9a am: 2b3e8ad368
am: 3f75400059

Change-Id: Id194bd88f4ac1cfd52e479f4f2401323dd83e596