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