.. to new-style UNO.

And deprecate old service in favour of singleton.

Change-Id: I67244097c22af02530214d7c529dd0d32f5964c1