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