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