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

Change-Id: I30aee664a2e98eb3dd8e433cea2f77aa27070147