Change-Id: I39a04cc76896674e8df743cdc85a9f09c4857907
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>