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