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