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