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