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