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