Merge "Fix wrong service name" am: 4bb98285c9 am: 349f80d82c

Change-Id: I451bd91bdb8eb6d97da0cc4acad7a10036ce575c