Change-Id: Ifec1a3200786f88e21feab57c4b8eac436c3f174
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>