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