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