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

Change-Id: I998f4018ac233ae1580a22b8a26c736372d38fb6