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