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