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