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