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