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