Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb am: 2b3e8ad3 am: 3f754000 am: 8690600c Change-Id: I8e06ce4174e091c1aa97dc976ce1ec172709628d