Merge "Minor, cosmetic changes on SystemServiceManager:"