Remove extra lines, those are in introduction. Fix wrong service name. This is a followup to a comment on Idf8cb90536fd4b4d9a2d0695ef30f498b1283410 after the merge. Change-Id: I75d3941248409b613a79ef9966b78ea7ac92e97d