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