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

Change-Id: I8e06ce4174e091c1aa97dc976ce1ec172709628d