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