Change-Id: I70ce407e2a0aa8046c28b02a995dbd9ff7dbee4e Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>