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