Merge "Fix wrong service name" am: 4bb98285c9 am: 349f80d82c am: 166734e659 am: 03d9bc5394

Change-Id: I71290be5cb55befe784ef07a73d983d559ceecbb