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