Change-Id: I7f65be81991130240e0ec74ebd43a8e0aa136a14
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>