Merge "Fix wrong service name" am: 4bb98285c9

Change-Id: I8da0f85e6826a25faa84d00c976e23ead82f99f0