Change-Id: Id469c958450ff94024b5fbb933e2bc5e04c94006 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>