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