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