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