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