Merge "ServiceManager: Internal renames" am: 674c8b1b88 am: 57aa489f84

Change-Id: I9833707945c77e5955913c8f835abfc013606766