And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I27e8843d5278d1b1a33bd7bdce2f0e721adbd725
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ic7862a4a97e60ed016a53f5893e03e3f9ec11e53
Reviewed-by: Patricia Santana Cruz <patriciasc@openismus.com>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Icbc8d105a3ffea2bf705d18e3413f6b3487ccfd3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>