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